remove typo and hlint suggestions