Modularized some things.