Addressed feedback from #22. please review