Bit of cleanup
Bit of cleanup.