#245 - Updates from code review