Reformatting refactors