Clean up code and externalize scale strategy from VHM