Refactor the filters & some clean up
Added phpci