fix typo and organize imports