Cleaning up this mess :)