Refactored a lot of the generator methods.
Refactored a lot of the generator methods.

Tightened up the code. Changed a bunch of explicit iterating into
map calls. Removed unnecesary array creation and return statements.

sn1de/mark_maker