Simplify draw code