[go2school] code refactoring