Clean up a little bit of this code. Uses seq/traversable once in some ap...

...i's rather than lists