• Fixed resource and clean up