Cleanup and code improvement.
Version update