Cleanup + move calls to textures properly load