Reformatting and Refactoring