Deleted some unused code and improve the url naming