Code cleanup with version update