Some refactoring.
Some refactoring.

dgreisen-cfpb/pantheon,dgreisen-cfpb/pantheon,Ooblioob/pantheon,imuchnik/devdash,m3brown/pantheon,imuchnik/devdash,cfpb/pantheon,cfpb/pantheon,Ooblioob/pantheon,dgreisen-cfpb/pantheon,m3brown/pantheon,cfpb/pantheon,imuchnik/devdash,dgreisen-cfpb/pantheon,imuchnik/devdash,m3brown/pantheon,Ooblioob/pantheon,cfpb/pantheon,m3brown/pantheon,Ooblioob/pantheon