Cleaned up main route