Made the filter more readable