fix some hlint suggestions
fix all suggestions