Clean up code for clarity.
Bump version.