New and fixed vim commands for refactoring