Some formatting cleanup