refactor likelihood models