Third step of refactoring is finished(thank CppCheck for that);