FIX: typos
FIX: filters moved to class