Imroved formatting