Made a handful of formatting changes and cleaned up my vim life.