#250 - little modifications after code review