Refactoring (clean code)