some refactoring in fabfile