cleaned up the Drawable interface and updated Graphics