#45 Updates from code review