switch to new version, format some code