performance improvements
performance: don't paint image objects on canvas
clean code