minor code changes, prepare to rework bean creation strategy