[Refactoring] Cleaning the code.