General style cleanup

DO NOT MERGE. JUST FOR REFERENCE