final refactoring for xml-less spring. Working!