Improved via hlint