Code cleanup, stream example