Added URL sharing; Cleanup