small cleanup from recent pull request merges

thank you,
Andrew