Refactor scope method into module filter