cleaning up some of cpplint's errors