More care required getting beans early in lifecycle
Apply eclipse-formatter conventions