fabfile code refactoring