added hlint suggestions