Cleaned up url scheme