Eliminates 3 lines
Further refactors filter
Refactors callout filter