COSMITS+ENH: improve readbility + trellis function

COSMITS+FIX