Address feedback comments