cleanup code, add in textures