Revert "Converted map() and filter() to list"

This reverts commit 9b9ec7b4e2c00aac482233f6b1638a97e0693a9c.