refactor -> move header filtering to another class
fixes #58