Refactors foundation for some minor style changes