Simplify code.
Bump version.