Just a little bit of modularization.