Add more explicit typing.  Some whitespace cleanup.  Some cleanup of deck generation.