newline cleanup
Updated headers