Cleaned up more URL methods to make updates easier

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>