More consistent use of canvas.width/height instead of hard coded numbers