Do some refactoring
Merge branch 'master' of https://github.com/d-pluschaev/pp_test