More clean up on Filter