Clean up Filter class