Remove unnecessary returns and use default parameters
Fix indentation on test
Merge pull request #2719 from epidemian/minor-embellishments

Minor embellishments