Merge "Code review cleanup" into main