- More cleanup, and code reuse