code refactoring
related routes management