cleaned up url management