cleaning generators
breaking out definitions
cleanup type
friendlier readme example