refactor jef