Use prettier URLs. Also, DRY