Cleanup with 80 line length max