Imporved formatting