Cleaned up routing for topics