Clean & refactoring