master: shortens wrapper lines