Addresses comments in pull.