Cleanup: shut up lint warnings, formatting, doc nit.