Improve modularization.