Renamed and made some minor changes/suggestions in the inequalities code