Tidy whitespace and routes