cleanup and modular setup.