Added URL field and trimmed some code