Cleaning up
A bit of cleanup