remove optional reflector dependency

+ use more generators instead of lists