Minor code tweaks to pass linting
Merge pull request #2942 from tgriesser/master

Minor code tweaks to pass linting