Replaced some underscore filters with native filters
Refactoring and cleaning