RVM

Improve modularity of major functions within the RVM