General tidying up without changing code