Change un-necessary map() to grep().