Code refactoring 1.0