addresses pull req comments