Refactor Generic Resources

## WHY
Whilst working on a separate issue, I found some of the repeated logic within genericresources could be isolated into a separate function and/or moved to utils, and helper files to remove repetition and improve readability. 

This is just to keep track of the status.
