A bit of cleanup
Misc. cleanup