#569 Refactoring
#569 Refactoring

CelineBoudier/rapid-router,CelineBoudier/rapid-router,mikebryant/rapid-router,mikebryant/rapid-router,CelineBoudier/rapid-router,mikebryant/rapid-router,CelineBoudier/rapid-router,mikebryant/rapid-router