Small typo and structure changes