refactor
more nose test generator bombs
simplify some more
prune whitespace at end of file