play and vagrant, refactor