fixed hlint suggestions