added syntax for filter, and more pretty-cleaning