create new file for filtering stuff and remove filter logic from other files