Refactor freeways