More cleanup...
More cleanup and derp.
Cleanup and moved modifiers function to BoilerPlate.