cleaning up generators
cc/ @taylorleese