Minor Changes to Code

No functional difference, hopefully. Just minor cleanup.