#8 - Updates from code review