Adding new version number for refactoring change, and moving some comments around