refactor and simplifiy fabfile