Code cleanup and version update