Addressed feedback from #28. please review