Refactoring and styling.