Modularize things.