Minor style cleanups
routers flag can take multiple values now