Final changes for 7beta2.
Bump version.
Improve code (readability, avoid import).