incorporate suggested simplifications