refactoring in fabfile