Additional cleanup for modular testable code