other things spring refactor