Refactoring: Code cleanup