Included Generators and made more pep8 compatible