refactor the school service feature