refactor(generators) changed specs, comments, scopes