Fix comment
Refactor: fix variable names