DONT MERGE: cleanup/anti-jank

This is an in-progress branch for cleaning up the code style across the project.  Leave feedback inline if anything looks odd.