refactoring: simplified some maps and filters