Renaming to be resource independant
Bit of tidying