Some resourceloader cleanup

More is needed, but this'll do for now