Refactor school