remove dealer autowiring
refactor format of result data
rename method
simplify predicate
clean up