fix typo
refactoring
fix typos
finish brb