refactor draw maps whiles to  list comprehensions