Cleaning up
Generator prototype