Code cleaning up for URL
Merge branch 'develop' into user