#54 - code review modifications