Cleaned up some code, changed the canvas size