formatter cleanup