tiny code cleanup
better formatting of new 'filter' element
make the RuleFilter interface more powerful by providing an argument with the matching tokens