Refactor and simplify URLs, removing unneccesary logic