Typo and structure changes