Typo in comment doc
Refactor and rename