Clean up draw-entity! functions