Code cleanup, new example