Improved structure and fix typo