refactor school