Merge "Nit clean up" into main