[SQUASHME] fix typo -> into commit 1
lint: fix unreadVariable warnings