Cleanup effort

Hey all, can you review and jump in with any cleanup contributions you see necessary?