Refactoring and style.