indention fix and rm router