Addresses issue #1273 (see Description)
Style changes to pass Rubocop
Merge pull request #1414 from JKinsman1993/jk1273_alt

Addresses issue #1273 (see Description)