A bit 'o cleanup
A bit of cleanup