add syntactical sugar to better match code examples
add syntactical sugar to better match code examples
remove custom matchers.  too much trouble