fixed filter, cleaning code