typo
Refactor and clean up