Clean up headers
format