Refactor web data utilities