Implement Team bean
refactor variable names