Try to get the formatting right