Refactored fabfile