Bumps version and does some code cleanup.