Refactoring Filter done.
utils added