Refactor: Cleaning