Some formatting improvements.