changed things as requested by pull request review