code cleanup and version number update