Address CR feedback on previous commit