formatting

Updated all formatting in preparation for ongoing work.