Refactor extracurricular activities