Fixed filter error, removed unneeded self arguments