Reformatting and refactoring.