move special handling in simplify to class level
Merge pull request #9 from smichr/simplify_logic

move special handling in simplify to class level