Cleaned up the wirefilter code (wirevalue definition)