refactoring skill options and school types