Minor refactorings
Enables vagrant box reload