Add more generators and clean up existing
Bugfix
Clean up sample code