Fixed a... cleaned up a .... thingy...