Made some more cleanups to be consistent with the other samples.