refactor and fix yml typo