DRY filters
whitespace cleanup