Simplify draw interface

See title