Textures and cleaned up structuring a bit