Code cleanup

Moved URLS to private variables.