refactored vim