Refactored some URL;