Minor de-uglification