start to refactor code for managers