Made changes to make Sonar happy.  Removed duplicate code, redundant
modifiers, and use of literals.