Code refactoring stage #3