Clean up && added utils files (as well as used them)
More clean up && added teacher parser for clarity