Clean-up and refactoring