Refactored vim