Code cleaned

Filters updated
Code cleaned a bit