Some code cleanups, still working on the canvas