hlint improvements