Correct schools nomenclature, and duplicate return statements