Small refactoring and formatting.