Just tidying up a bit. :)