Cleanup
Improved filter to accept custom arguments