#294 - Updates from code review