Formatting improved