JSF refactor