Refactoring and a lot of cleaning.