Linting fix: Make return values consistent and more straitforward
Merge pull request #1112 from FredKSchott/linting-fix-consistent-return

linting fix: Make return values consistent and more straitforward