refactoring
refactoring, changing to e4 beans