Small refactor
Added some url helpers