added Spring InitializingBean; code cleanup