Some formatting improvements