#50 - after code review