All work finished. The next step - code refactoring