keep cpplint happy, mostly about line length