Cleaned up router some more