Cleanups, Generalizations & stat metrics