Code refactoring stage #2