cleanup, multline expressions now reside on a single line