Take more hlint ideas