Bits of refactoring and housekeeping.
Bits of refactoring and housekeeping.