code clean up.
working in progress
Finished bean model for v2.3.0