Address @jlee-r7's feedback