* streamline operator code

* small cleanup

* further restructure of draw operator

* extract functions from operator

* fix trailing missing arg, works now

* ensure identical whitespace

* test whitespace