hlint prompted cleanup