Initial formatting cleanup