Double formatting improved by simplification!