A bit of cleaning up
Clean up