Formatter cleanup