#51 - code review