Modularizing a bit.