Make feature more high-level