Ongoing refactoring efforts

Ordered Vim's arg lists for clarity.

Eliminated redundancies and simplified.