More cleanup and modularization