Tech Debt: Partial refactor of vim file

There is still work that needs to be done on the refactoring front. This
is a start though.