various code refactoring (vagrant package, object injection)