* Fix errant const methods * Remove NOLINT since clang-tidy is pretty conservative * Missed one * Fix a few more errors * Add reviewer suggested comments * Run clang-format
* Fix errant const methods * Remove NOLINT since clang-tidy is pretty conservative * Missed one * Fix a few more errors * Add reviewer suggested comments * Run clang-format