Btag cond format

New pull request, implementing the feedback on #6336.