clean assertions slightly