Cleanup whitespace/fix more rebase derps