clarify
simplify
improve consistency