Little cleaning up of RouterFactory