Minor tidy-ups pre starting Resource and Texture implementations