[School] Cleaning up code...