Docs: updated after latest release
Cleanup: adjusted variable names