readability improvements
more consize syntax using dict in redraw