Refactoring

Refactored the arg parsing and instance creation internals of Factory as well as Generator._generate_emailfield/_iter_for_choice