Address CR feedback from @Grunny