Issue #157 - AND functionality clean up