A bit more cleanup/refactoring

Removed some original refactoring... will re-add if additional non-vp
implementation need arrises