Refactored my vim files