Refactor vagrant