Code cleanup, remove canvas border