Refactoring and reformatting.