Minor cleans up
Clean draw function for Object