#63 - after code review