some clean-ups in format