Including hlint suggestions