Revert "Revert "Revert "Revert "Minor cleanup of code"""" To redo reversion...

This reverts commit e56cf5a774e2dd33c796fe03b12ebf085b431158.