Address Wayne comments from atambo's last PR