Improve Code Climate

Previously there was some method complexity and duplication that was
detrimental to the codebase.  This has been improved.

[#49350935]
Merge 49350935-code-climate to master

[Completes #49350935]