stylistic and further hlint improvements