tighter organization for mixed effects