refactoring for clearer resources