removing some cpplint talkiness