#240 - code review modifications

#240