minor refactoring for non-vagrant installation