More resource tidy