fix typo, style, unuset code