Minor amends to Style and rename router