Code cleanup, refactoring