refactor some beans (2)