Cleanup and first vim fixes.