Cleaner resource usages