Bunch of refactoring after school integration.