Cleaned up routing.