Make hack less terrible