Cleaned up the DrawableObject code a bit