Cleaning the code after previous refactoring