cleanup part 1
cleanup part 2
start improvements to demo app using de2d