Clean-up, refactoring