Clean Up Some Code and Made Texture Choosing Better