#79 - code review modifications

#79