formatting improved