Some code clean-up.
Bump version.