General tidying up xD