some tidying in the likelihood classes