split into other files
fix typo