Removed outdated references and improved semantics