#132 - code review modifications

#132