mathlib

34df5d80 - tidy more following suggestions from code review