refactor - mhuckaby : removed unreachable condition; increased coverage
refactor - mhuckaby : simplified filter methods; increased coverage