Clean & refactoring.