A bit of cleaning up
A bit of cleaning up