some code refactoring
some code refactoring
first results