Finish up refactoring of VP