applying pull-request suggestions