CodeQL fixes and minor refactoring#126

dylanbmorgan wants to merge 4 commits intomainmaurergroup/dfttoolkit:mainfrom

ql_security_fixesmaurergroup/dfttoolkit:ql_security_fixesCopy head branch name to clipboard