Address initial comments