Tidying up and removing unneeded code!