WIP: break or shorten some long lines