some more refactoring in fabfile