addressing previous commit comments