Formatting / Cleanup.