Clean-up & refactoring.