Cleaning up cli options for gen