Small style changes; proper comprehensions instead of zip, and so on