Refactoring: cleanup
Refactoring: name cleanup