feedback
Merge some of Evgeny's suggestions (github.com:shadchnev/test6)