code cleanup -- put paths inside url functions