Additional cleanup
Formatting