Version increment, code cleanup.