Clean and code optimization. Changing version.