Implemented some of the suggestions by coach (#228)