Refactoring and style before big refactoring.