Some minor cleaning up.
Some minor cleaning up.
Some minor refactoring.