Included Hlint suggestions