Use list comprehensions instead of map

The higher order map function is considered to be unpythonic and looked
a little messy as I was having to use a lambda anyway