nack on TODO. style is currently to have these filters inline. really need to extract one-liners into separate place?