Minor suggestions for simplication