Refactor SimpleGenerator
Use IRandom everywhere