some more formatter cleanup