Cleanup of ri.vim