Minor cleanups
Add support for filters
Fix indentation