Clean UP, refactored Vimfiles