Issue 176

Implemented notes from code review