Cleanup
A bit of cleanup