some formatting and route cleanup