whitespaces
first refactoring of routing
route refactoring
tests for routing refactoring adapted