Updating docs, names, making generator a class