2.1.6 - Code refactoring