clean up import
fiw main retrun type
extract RouteResolver interface and remove one object
update test unit
mimize visibility, and final classe when possible
add final
Merge branch 'features-pool' into develop