#32 - code review

#32