Refactor routing and states