Cleaned up router