Cleanup code a bit; Fix command line for vim/gvim