Refactoring and cleanups.  Progress adding bean names.