#60 - code review modifications

#24, #37, #38, #39, #54, #60