hlint warnings fixed