- Cleaned up some of the drawing code, specifically dealing with