Vim fixed editor commands, clean up