Simplify RWS module.
Fix Logic.Formula to use new RWS module.
Better naming.