Refactor Brocfile