update structure and typo