Remove the use of map(second)