Some more modularization.