Tidying up a bit
More cleaning up a few more stuff.