simplify/improve kw proposals code