Merge "Minor kotlin cleanup" into main