Hlint suggestions applied