Cleaned up filter.v