refactoring: cleanup formating
refactoring: more spring injections