restyled code once more