Code cleanup
Refactoring