#175 - Updates from code review