Address initial review feedback